* lisp/custom.el (custom-push-theme): Quote "changed" custom var entry.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 869731b242e2e2d2e936fd66aa37947f0a99e2ae..1d4a9680318d2f1486d48af756cafd6139fb582a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-21  Chong Yidong  <cyd@stupidchicken.com>
+
+       * custom.el (custom-push-theme): Quote "changed" custom var entry.
+
 2011-03-21  Leo Liu  <sdl.web@gmail.com>
 
        * ido.el (ido-read-internal): Add ido-selected to history instead

diff --git a/lisp/custom.el b/lisp/custom.el
index cf06fe27f4deb949fd01abdf33beee420e3e6bd4..4f7826093e82a3cc7671e0921795de9f1401e32a 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -849,10 +849,10 @@ See `custom-known-themes' for a list of known themes."
        ;; theme is later disabled.
        (cond ((and (eq prop 'theme-value)
                    (boundp symbol))
-              (let ((sv (get symbol 'standard-value)))
-                (unless (and sv
-                             (equal (eval (car sv)) (symbol-value symbol)))
-                  (setq old (list (list 'changed (symbol-value symbol)))))))
+              (let ((sv  (get symbol 'standard-value))
+                    (val (symbol-value symbol)))
+                (unless (and sv (equal (eval (car sv)) val))
+                  (setq old `((changed ,(custom-quote val)))))))
              ((and (facep symbol)
                    (not (face-attr-match-p
                          symbol